Changes made following Mike's instructions

More testing in Spec and cleaner code
Refs: #5