Tested some bugs