Add documentation/debug messages and small test adjustments
Refactor test loading