Working on adding the missing unit tests