Stats file updates + test updates + bug fixes