More unit tests. That should be enought to start.