renamed classes, changed tests