Improves tests, compilation