Consolidated more tests and added to the reflection tests