Refactor tests and change inclusion behaviour of last minute