final commit, uncomment tests!