Adds additional parsing and testing
minor fix
secondary minor fix