Added test to check correct installation

Remove git conflict leftover