Fixing test
Minor cleanup