Re-assigned some responsibilities and tests accordingly