Uncomment and fix previously failing test
Format for readability
Fix commented out tests