Final testing finished, final commit