3,madigan6: added a couple more main activity tests, commented tests