Removed unused updateActiveData
test suite re-organized