Added more unit tests. Changed parser regex to be slightly more flexible