Rename file
Start work on parser unit tests