Merge pull request #12 from Kloadut/master

[ref] Test and function clean up
Fixed: tests bootstrap
[fix] Timeout adjustments and continuous replication