Add tests that prove #42 and #55 are fixed