Add more tests, following issue #143