Cleaned up regex'es in TypeTester. Still need more tests though.