Tests fixed. Final test added