#20 Modified Tests to conform to changes