Fixed up test to a working state