Added test folder + test classes and extended xml to allow building tests