#31 - tidied unit tests and got them running via team city.