Adapted test names to what they actually test
Merge branch tylus:patch-1 into master