Fixed failing tests
Updates to support automated tests