moved tests for ease of use