Removed unit tests and went for integration type tests