Restructured more unit tests
Dynamically load dependencies using Aether