Merged Files
Added test for outstanding bugs