Change to build system and change to some test files