Adjusted Tests, removed @Ignores