Fixed issues that were causing tests to fail/error
2 files changed