Finished up test
Fixed up last bits of test