Deleted unnecessary resources files and classes, split out test main functionality