+1 for moving it to a test