Get unit tests working
Merge