Reworking tests
More tests