Ability to add BaseAddress to client

Also added test bench back