Add more test + format code