More tests and moved more functions
p4#: 20447