Pulled out print tests and clened structure.