more tests, fix #360

Bit of a cop out, but less tests are being skipped now