fixed tests, sorta. need to double check coverage and shit