I've started to create tests, Some code is modified.