moving and adding to tests