fixed spec link
merging
added test directories