fixed issue with last tests being overcomplicated