Trying to get testing to work
Credit where credits due
Merge branch 'tests'