Update Tests
Reorganize