Adding Proper tests