Converted some tests to TypeScript