Added unit test stuff. Removed captions stuff.