Refactors Tests and forms