Fixed tests for stuff