Fix test, some cleanup