Removed unused code and fixed issue with test group