Fixed build after merge. Updated tests.