Renamed some test helpers for clarity. Implemented Organization functional tests.