Fixes and initial work on the first test