Fixes; clean up tests