improve tests and changes table names for more meaningful names