Changed tests to consecutive codestandard