Changes made to unit tests as per review