Remove magic strings
Added invalid format tests
Add other type checking tests