Reorganized tests for interfaces, added categories