Clean up tests so they pass. More tests needed.