Modified initial specs/test code