Remove commented code
Set initial state for objects as collapsed
Update tests for the new initial collapse state of objects