formatting test and fixes