bugfix & tidying up
removed old tests from travis-ci