Added and improved tests