cleanup
fixed some tests