some tests were using hackish style