Final working version of HW1
Removed unused tests