Moved stuffs from app object into test