Removed few print statements, fixed table names in tests to avoid name conflict