New unit tests and project layout