Added the first batch of unit tests