Added more pretty and fixed tests