Moved test stuff around