Added more tests. final fix for #16