[Issue #93][WIP] added tests
[Issue #93] tests modified
[Issue #93]