[Mark] Moving main method to Main class, adding test cases