[Issue #186][WIP] added tests