Added many tables and other tests