Added tests and update crud pages