Added tests for model-handler and fixed every bug I could find.