fixed some testing problems