fixed tabs, removed commented tests