We should move away from the *Tests magic - maybe have a test lib in subfolder for all the common stuff?