Fixed project build
Fixes for test structure
Fixes for test structure
Replaced tests with directive (particular)