Unit tests now included!