Added inline tests.
Enhanced includes in tests