Adding test class, bugfixing
Bugfixes