Signature: Tests. Improved but not completed therefore not yet connected to app