Some more tests and nicer test runner