Minor progress with tests