fixed tests and added some more style