Working on missing unit tests