Adding Test Files and Fixes