removed comments
added working tests