Changed test package structure and seperated colidation into figure
specific colidation plus a colidation class for often used colidation
checks