Adds Unit tests. Modification of bootstrap...