Added functional tests that pass with mock classes