Wrote first tests with Andy