Association Test + Other Small Changes