Get tests 1-3 working