Added features and test specs.