Tests moved to the correct folder