close #1
some test tweaks