Minor refactorization, ignored type writer tests as the TypeWriter is to be replaced.