Updated tests and controllers for new non-null requirements