Fixed typos
Added common errors
Updated tests and loader