Add functional test to ms