Revert "Fixing build by using a name that appears first"

This reverts commit 6ba09f85ea1bfc1f06d29254380daaf00a9cc8f3.
More readable tests, conforming to *nix standards