removed comments
added tests