Unit testing now working