Adding unit tests for Rayne Beridon (rrb838) and Michael Both (mjb3299)