fixed broken & invalid tests.