more tests added & fixed