tests fixed
changed test file names to match new fxn names