Fixed dependency references;
Added back basic test;
Fixed keywords.