Adjustments

Deleted some test classes, changed some ugly names.