Refactored tests, included one more test, fixed a bug
Refactored tests, included one more test, fixed a bug