Added even more tests. 100% coverage :)