Adding methods to pass tests, adjusting tests to work

Added methods to ensure tests will pass. Also changed a few logic errors
in tests so they correctly tests what they were ment to. Changed a few
variables in Tests to make sure tests pass because variables were making
tests fail.