Make all tests for scalars work