tests and close #57