* Fixing tests and squashing * Updating as per some PR comments * PR comments Signed-off-by: Noel Georgi <18496730+frezbo@users.noreply.github.com>