added more tests and validates on account