Unit testing
Add first set of features