Tests moved to the separate folder