Finished with testing system. Added test loading via xml.