Added working test version