ticket:15 change view and added tests