fixing testing problems