Fixed some issues found while writing tests
Added tests for page locking views