Updated naming conventions.
Added more unit tests.