Api V2 - Fixed system tests