Fixed various failing tests