filled in existing tests -- untested