Add test suite
Added new expectations
Updated namespace