more tests and fixes, foramting method