FIX: some tests
FIX: Tests that failed due to merge