Split test fixtures. Added more tests.
Added layers to categorize new tests.