Added required fields in the monitor db
Added some tests, removed API tests.