fixes option method, adds tests