tests fixing and improving