Added and fixed few tests. All pass now.