updated to tests to reflect the changes, I know tests should be updated first...