Move test where it belongs! Oops...