Added more complete tests and pretty property