Moving Tests into Tests folder