Tests now functional (#4)