Close #2, reorganize the tests