add table fixture and improve base