Fixed tests, commented out DB loader