Updated unit tests, sql script, correlation page