Cleaned-up tests and class