Getting ready for unit tests