Revert "2014-06-21 test_01"

This reverts commit 0b2765373c739bc09a17e48babb667a33887d893.
Revert "Revert "2014-06-21 test_01""

This reverts commit f867a40bc27f54848949af25542b8aa156d2db06.