Fixed naming convention and started writing unit tests