Partial 5.4.1, 5.4.2, 5.4.3

Done for adding test categories