Fixed tests passing and such..