Added account model and brought back user tests (commented out for now)