Tests moved to appropriate libraries