Test: refactor unit tests to be spec-like