Manually include class in unit test for php 5.2, and test improvements.