Finished tests, added user bootstrap