Fixed unit tests for behavior