Initial Tests

Consistency Fixes