Cleaned up a litte, added one hot encode test