Removing TAL dependency for testing