[Isue #186][WIP] adding tests
[Isue #210][Finish] modified view