Fixed tests. Removed commented code