Functional and integrity tests added