Restore tests - not everything is passing yet
Remove commented out code