Improve unit tests as succested by @before. #12.