Added tests and matched format