reorganising tests to work with testling-ci