Eliminate possible cause of NullPointerException
Add ShowActivity test, reorganize tests