Some work on tests
Merge pull request #3 from tomphp/testing/work-on-tests

Some work on tests