fixed starting index for for-loop
added missing @Test's