Restructured test suite
Simplified promise resolution
Added model deletion
Build