Got Core functional tests to pass.