edit spec
cleaned spec
cleaned up some tests, ready for delivery