new tests. ready for handin