Fixed unit tests for #11