clean-up, split tests up more