Worked on unit tests
Merge branch 'stage' of https://github.com/stevemcquaid/boa into stage