testing all fixes