Refactored main class, added test for value converter