merged tests -- closing issue 5