Final tests, local version sooo close to completion