Created more tests
Refactor and fixed a bug