Cleanup of bootstrap and add test class