diff --git a/docs/src/main/asciidoc/adapters/aws-readme.adoc b/docs/src/main/asciidoc/adapters/aws-readme.adoc
index b2961bc43..9698a3dd6 100644
--- a/docs/src/main/asciidoc/adapters/aws-readme.adoc
+++ b/docs/src/main/asciidoc/adapters/aws-readme.adoc
@@ -1,3 +1,3 @@
 This project provides an adapter layer for a Spring Cloud Function application onto AWS Lambda. You can write an app with a single `@Bean` of type `Function`, `Consumer` or `Supplier` and it will be deployable in AWS if you get the JAR file laid out right. The best way to make it work is to include `spring-cloud-function-context` as a dependency, but not the higher level adapters (e.g. `spring-cloud-function-stream`).
 
-include::aws-intro.adoc[]
+include::adapters/aws-intro.adoc[]
diff --git a/docs/src/main/asciidoc/adapters/aws.adoc b/docs/src/main/asciidoc/adapters/aws.adoc
index 1205b43a6..ca70f8a5b 100644
--- a/docs/src/main/asciidoc/adapters/aws.adoc
+++ b/docs/src/main/asciidoc/adapters/aws.adoc
@@ -8,7 +8,7 @@ The https://aws.amazon.com/[AWS] adapter takes a Spring Cloud Function app and c
 
 == Introduction
 
-include::aws-intro.adoc[]
+include::adapters/aws-intro.adoc[]
 
 == Functional Bean Definitions
 
diff --git a/docs/src/main/asciidoc/adapters/azure-readme.adoc b/docs/src/main/asciidoc/adapters/azure-readme.adoc
index 9a59baa8e..7f84acb5e 100644
--- a/docs/src/main/asciidoc/adapters/azure-readme.adoc
+++ b/docs/src/main/asciidoc/adapters/azure-readme.adoc
@@ -1,7 +1,7 @@
 This project provides an adapter layer for a Spring Cloud Function application onto Azure.
 You can write an app with a single `@Bean` of type `Function` and it will be deployable in Azure if you get the JAR file laid out right.
 
-include::azure-intro.adoc[]
+include::adapters/azure-intro.adoc[]
 
 == Sample Function
 
diff --git a/docs/src/main/asciidoc/adapters/azure.adoc b/docs/src/main/asciidoc/adapters/azure.adoc
index 80b765736..efbb65533 100644
--- a/docs/src/main/asciidoc/adapters/azure.adoc
+++ b/docs/src/main/asciidoc/adapters/azure.adoc
@@ -6,4 +6,4 @@
 
 The https://azure.microsoft.com[Azure] adapter bootstraps a Spring Cloud Function context and channels function calls from the Azure framework into the user functions, using Spring Boot configuration where necessary. Azure Functions has quite a unique, but invasive programming model, involving annotations in user code that are specific to the platform. The easiest way to use it with Spring Cloud is to extend a base class and write a method in it with the `@FunctionName` annotation which delegates to a base class method.
 
-include::azure-intro.adoc[]
+include::adapters/azure-intro.adoc[]
diff --git a/docs/src/main/asciidoc/adapters/openwhisk-readme.adoc b/docs/src/main/asciidoc/adapters/openwhisk-readme.adoc
index 9e13bbccc..7dd5cc195 100644
--- a/docs/src/main/asciidoc/adapters/openwhisk-readme.adoc
+++ b/docs/src/main/asciidoc/adapters/openwhisk-readme.adoc
@@ -1,6 +1,6 @@
 == Quick Start
 
-include::openwhisk-quick-start.adoc[]
+include::adapters/openwhisk-quick-start.adoc[]
 
 == Examples
 
diff --git a/docs/src/main/asciidoc/adapters/openwhisk.adoc b/docs/src/main/asciidoc/adapters/openwhisk.adoc
index 442b264b7..2c5d35118 100644
--- a/docs/src/main/asciidoc/adapters/openwhisk.adoc
+++ b/docs/src/main/asciidoc/adapters/openwhisk.adoc
@@ -7,4 +7,4 @@
 The https://openwhisk.apache.org/[OpenWhisk] adapter is in the form of an executable jar that can be used in a a docker image to be deployed to Openwhisk. The platform works in request-response mode, listening on port 8080 on a specific endpoint, so the adapter is a simple Spring MVC application.
 
 == Quick Start
-include::openwhisk-quick-start.adoc[]
+include::adapters/openwhisk-quick-start.adoc[]
diff --git a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java
index c91391667..357102744 100644
--- a/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java
+++ b/spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/mvc/RoutingFunctionTests.java
@@ -131,7 +131,6 @@ public class RoutingFunctionTests {
 						.contentType(MediaType.APPLICATION_JSON)
 						.header("function.name", "fluxconsumer")
 						.body(new String[] {"a", "b", "c"}), String.class);
-		//assertThat(postForEntity.getBody()).isEqualTo("[\"A\",\"B\",\"C\"]");
 		assertThat(postForEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
@@ -192,11 +191,8 @@ public class RoutingFunctionTests {
 
 		@Bean
 		public Consumer<Flux<String>> fluxconsumer() {
-//			return v -> v.map(value -> {
-//				return value.toUpperCase();
-//			});
 			return flux -> flux.doOnNext(s -> {
-				System.out.println(s + " jkljlkjlkj l");
+				System.out.println("Received: " + s);
 			}).subscribe();
 		}