Fixed issues that were causing tests to fail/error