Activity migration

some more fixes for activity test