renamed tests and some style changes