Moved testclasses to separate package