Sidaz sam

We've completed all the pending tests and also modified the code so that all the tests that were not passing are now all passing.