Rework tests

Just a test. Let's see what happens.