Update tests so that it always passes / builds.
Build against Python 3.4
Merge branch 'feature/Add_some_basic_tests' into develop