Fixing
Added testing suite