changed tests and aesthetics