Added & updated some EMR unit tests