Fix proper tests