Implemented vocab service and fixed tests
Added unit tests for controlled  vocabulary tests