fixing foramtting and test