test cleanup, remove obsolete tests for #138