Trying to move tests back up out of code