fixing & writing more tests