Additional tests. Close #2 #4