* Added and fixed a few tests