Adding new tests to show bug
possible fix for bug
proof of fix
fixing error on checkstyle
adding moar tests
Adding tests for multi devices/categories, but not included in query
Merge branch 'CategoryModelBug' into 1.0.x