Added tests for scheme detection #26