Unit test updated to fit code conventions