Updated functional tests to include internal services