This is a  test
Fix some more issues
Clean up testing