Added tests, pulled prison out of test file
merge issues