cleanup; use "@:expose" for class; all tests added