more test, some cleanup