Added spec tests
Modified spec