Unit test added. User interface improved.