small bugs, start unit tests