Updated tests, merged with old activity tests