Fixed up test - removed redundant stuff