Updated class locations
Added what will be parser unit test