Make expect global, create test for app module
Update comments and sign code