Issue #262 (still working on it)

Some integration tests was added