fixed more testing issues