slight restructure of activity tests