support running single tests
fixed some tests