New unit test and removal of directories accidentilly added to repo.