Feature/63 refactor all tests to use concise