Filling in System tests, fixing system