WOrking on tests
Finish getting tests to pass