Completed tests and implementation for reviews