Fix the test
More typescript interfaces