Added test waypoint files; fixed test to load file from bundle; Fixes to parser and waypoint objects