refactored some tests
asdf
added die and tests
fixed up some tests: