Add more tests (broken, needs a refactoring of the build script)