Updated/reworked tests