Adjusting a few names. Adding tests.