renamed stuff in common
fixed cmakefiles
re-added test for common