Optimized builtin factory in favor of handlers
Removed builder/parser tests replaced by handler tests