clean tests for @aspiers, update #20