Some tests were written. Some other changes.