Reverse back to remove bootstrap-editabl
Edit tests
Clean up