Added tests to validate basic consistency