Unit tests now work