Tests updated

lines ##29, 55