Changed location of generating start and finish
Added tests given from Canvas