Adds additional tests & improves existing ones