made tests less redundant and got them to pass