Added spec tools and tests