Don't merge: getting testing working