diff --git a/src/libraries/turtle/functional.hpp b/src/libraries/turtle/functional.hpp
index 91e9154..fb54d69 100644
--- a/src/libraries/turtle/functional.hpp
+++ b/src/libraries/turtle/functional.hpp
@@ -58,7 +58,7 @@ namespace detail
         template< typename Y >
         bool operator()( const Y& y ) const
         {
-             return y == t_;
+            return y == t_;
         }
     private:
         T t_;
@@ -74,7 +74,7 @@ namespace detail
         template< typename Y >
         bool operator()( const Y& y ) const
         {
-             return &y == t_.get_pointer();
+            return &y == t_.get_pointer();
         }
     private:
         boost::reference_wrapper< T > t_;
diff --git a/src/tests/turtle_test/format_test.cpp b/src/tests/turtle_test/format_test.cpp
index ab41c6a..908c9e2 100644
--- a/src/tests/turtle_test/format_test.cpp
+++ b/src/tests/turtle_test/format_test.cpp
@@ -22,12 +22,6 @@
 namespace
 {
     struct non_serializable_type {};
-
-    struct serializable_type {};
-    std::ostream& operator<<( std::ostream& s, const serializable_type& )
-    {
-        return s << "serializable_type";
-    }
 }
 
 BOOST_AUTO_TEST_CASE( type_not_serializable_in_standard_stream_yields_an_interrogation_mark_when_serialized )
@@ -40,6 +34,16 @@ BOOST_AUTO_TEST_CASE( base_type_serializable_in_standard_stream_yields_its_value
     BOOST_CHECK_EQUAL( "42", mock::format( 42 ) );
 }
 
+namespace
+{
+    struct serializable_type {};
+
+    std::ostream& operator<<( std::ostream& s, const serializable_type& )
+    {
+        return s << "serializable_type";
+    }
+}
+
 BOOST_AUTO_TEST_CASE( custom_type_serializable_in_standard_stream_yields_its_value_when_serialized )
 {
     BOOST_CHECK_EQUAL( "serializable_type", mock::format( serializable_type() ) );
@@ -49,13 +53,13 @@ namespace
 {
     struct convertible_to_int
     {
-        operator int() const { return 0; }
+        operator int() const { return 12; }
     };
 }
 
 BOOST_AUTO_TEST_CASE( custom_type_convertible_to_base_type_yields_its_value_when_serialized )
 {
-    BOOST_CHECK_EQUAL( "0", mock::format( convertible_to_int() ) );
+    BOOST_CHECK_EQUAL( "12", mock::format( convertible_to_int() ) );
 }
 
 namespace