Fixed your current PR

* fixed tests
* fixed the "detail modal view" bug