Added unit tests. Removed catches.