removed test_ prefix and tweaked comments