Even More Tests

Bug still here...