Tidied project, fixed unit tests build.