Style updates and added tests.