Moved tests back to their own project
Get unit tests working again