Updated mainactivitytest from testing branch