Added and cleaned tests