Restructure tests directory; remove closures to support php 5.2 in tests...

...; travis build in php 5.2 - closes #38