#6 removed depricated amount decorater and added tests