WEB-494 tests and implementations completed