Tests modified a bit, some clean up