More testing, awslisting and help messages