Added unit tests, changed company display name