Changed db schema, better formatting
Added more testing functions, DB cleanup before new insert