Implemented tests and fixed bugs for address reservation