Updated to create a few more objects for use in parsing and added a few very simple tests