Fix unit tests
Add a script to run all unit tests
Merge branch 'testing'