Add tests, recompile