tests broken up a little