Modifications in order to easyly exclude some spec tests
Added more spec based test