Added main class and test