Fixes various Tests