Finished the implementation of locations for test targets