Added 100% test coverage