Small fixes

Remove useless code and make sure the test file is included