Added tests and fixed attibuteVlalues api